Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipython embed script #1431

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

sankar-mukherjee
Copy link

No description provided.

@lamblin
Copy link
Member

lamblin commented Mar 12, 2015

The state of this PR is strange:

  • it cannot be merged because of conflicts
  • it only contains commits by someone else
    My guess is that you tried a rebase that did not work as intended.
    If you still have your original changes in one commit, can you try to rebase on top of the latest master?
    Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants